diff --git a/admin/controllers/receiver/Owners.php b/admin/controllers/receiver/Owners.php index 2c5397fe..98e1e9fc 100644 --- a/admin/controllers/receiver/Owners.php +++ b/admin/controllers/receiver/Owners.php @@ -425,6 +425,7 @@ class Owners extends HD_Controller $data = $indexs = array(); $res = $this->dataSelect($params); $fileName = $res['_title']; + $indexs_tags = array(); foreach ($res['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; @@ -441,7 +442,19 @@ class Owners extends HD_Controller $temp['biz_name'] = $value['biz_name']; $temp['admin_name'] = $value['admin_name']; $temp['u_time'] = $value['u_time']; - $data[] = $value; + + $tag = $this->get_tag($value['id']); + foreach ($tag as $key2 => $val2){ + $tag_id_key = 'tag_id_' . $val2['id']; + $tag_name = $val2['name']; + $tag_value = $val2['value_name']; + if (!in_array($tag_id_key, array_keys($indexs_tags))){ + $indexs_tags[$tag_id_key] = $tag_name; + } + $temp[$tag_id_key] = $tag_value; + } + + $data[] = $temp; } $indexs = [ 'name' => '车主', @@ -459,6 +472,7 @@ class Owners extends HD_Controller "admin_name" => "销售员", "u_time" => "最后操作时间", ]; + $indexs = array_merge($indexs, $indexs_tags); array_unshift($data, $indexs); $this->load->library('excel'); $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis')); @@ -505,20 +519,24 @@ class Owners extends HD_Controller foreach ($res as $key => $val) { $list = []; $value = ''; + $value_name = ''; $res2 = $this->mdOwnersTag->select(['status' => 1, 'pid' => $val['id']], 'sort desc,id desc', 0, 0, 'id,name'); foreach ($res2 as $key2 => $val2) { //检查是否选中标签 $setValue = ['id' => $val2['id'], 'name' => $val2['name']]; if ($val['type'] == 'checkbox') { $setValue['checked'] = $tag_data && in_array($val2['id'], $tag_data) ? true : false; + $setValue['checked'] && $value_name .= $val2['name'] . ' '; } else { if ($tag_data && in_array($val2['id'], $tag_data)) { $value = $val2['id']; + $value_name .= $val2['name']; } } $list[] = $setValue; } - $show[] = ['id' => $val['id'], 'name' => $val['name'], 'type' => $val['type'], 'value' => $value, 'list' => $list]; + $value_name = trim($value_name); + $show[] = ['id' => $val['id'], 'name' => $val['name'], 'type' => $val['type'], 'value' => $value, 'value_name' => $value_name, 'list' => $list]; } } return $show;