Commit a3d71d89 authored by hujun's avatar hujun

监督执行和门店拜访列表

parent 1b41ddff
...@@ -88,7 +88,7 @@ class Supervise extends Basic ...@@ -88,7 +88,7 @@ class Supervise extends Basic
} }
/** /**
* 监督执行列表 * 监督执行和门店拜访列表
* *
* @return \think\Response * @return \think\Response
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
...@@ -111,7 +111,7 @@ class Supervise extends Basic ...@@ -111,7 +111,7 @@ class Supervise extends Basic
//拜访类型(0代表门店拜访、1代表监督执行) //拜访类型(0代表门店拜访、1代表监督执行)
if (empty($this->params['visit_type'])) { if (empty($this->params['visit_type'])) {
$where .= ' AND visit_type = 0'; $where .= ' AND visit_type = 0';
$fields = 'longitude,latitude,address,a.remarks,scene_photo,b.name,a.created,b.phone,a.leader_name,agentshopname'; $fields = 'longitude,latitude,address,a.remarks,scene_photo,b.name,a.created,leader_name,leader_phone,b.phone,agentshopname';
} else { } else {
$where .= ' AND visit_type = 1'; $where .= ' AND visit_type = 1';
$fields = 'longitude,latitude,address,a.remarks,scene_photo,b.name,a.created'; $fields = 'longitude,latitude,address,a.remarks,scene_photo,b.name,a.created';
...@@ -160,7 +160,7 @@ class Supervise extends Basic ...@@ -160,7 +160,7 @@ class Supervise extends Basic
if ($where) { if ($where) {
$agent = new AAgents(); $agent = new AAgents();
$field = 'a.id,a.leader_name,a.leader_phone,b.store_name,b.province,b.city,b.district,b.address,b.longitude,b.latitude,a.store_id'; $field = 'a.id,b.store_name,a.name,a.phone,b.province,b.city,b.district,b.address,b.longitude,b.latitude,a.store_id';
$data['data'] = $agent->searchAgentShop($pageNo, $pageSize, 'id DESC', $field, $where); $data['data'] = $agent->searchAgentShop($pageNo, $pageSize, 'id DESC', $field, $where);
} else { } else {
......
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