diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index b45cd859..a69e5c4c 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -172,6 +172,13 @@ class Goods extends HD_Controller $info['p_time'] = $re['p_time'] != '0000-00-00 00:00:00' ? $re['p_time'] : ''; $info['out_time'] = $re['out_time'] != '0000-00-00 00:00:00' ? $re['out_time'] : ''; $info['bill_time'] = $re['bill_time'] != '0000-00-00 00:00:00' ? $re['bill_time'] : ''; + if($info['addr_id']){ + $this->load->model("sys/sys_addr_model", 'addr_model'); + $row_addr = $this->addr_model->get(array('id' => $info['addr_id'])); + $info['address'] = $row_addr['city_name'].$row_addr['county_name'].$row_addr['title']; + } else { + $info['address'] = ''; + } $this->data['info'] = $info; return $this->show_view('/items/goods/get_info'); } diff --git a/admin/controllers/receiver/Clues.php b/admin/controllers/receiver/Clues.php index e04f876d..ff5241b4 100644 --- a/admin/controllers/receiver/Clues.php +++ b/admin/controllers/receiver/Clues.php @@ -62,13 +62,18 @@ class Clues extends HD_Controller //获取来源 $cf_id_arr = array_unique(array_column($rows, 'cf_id')); $cf_rows = $this->clues_cfrom_model->get_map_by_ids($cf_id_arr, 'id,title'); - //获取销售员 + //获取管理员 + $this->load->model('sys/sys_admin_model', 'admin_model'); $admin_id_arr = array_unique(array_column($rows, 'admin_id')); - $admin_rows = $this->app_licheb_users_model->get_map_by_ids($admin_id_arr, 'id,uname'); + if($admin_id_arr){ + $str_ids = implode(',', $admin_id_arr); + $where = array("id in ({$str_ids})" => null); + $map_admin = $this->admin_model->map('id', 'username', $where); + } foreach ($rows as $key => $val) { $val['cf_title'] = isset($cf_rows[$val['cf_id']]) ? $cf_rows[$val['cf_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; - $val['admin_name'] = isset($admin_rows[$val['admin_id']]) ? $admin_rows[$val['admin_id']][0]['uname'] : ''; + $val['admin_name'] = isset($map_admin[$val['admin_id']]) ? $map_admin[$val['admin_id']] : ''; $val['mobile_sub'] = $val['mobile'] ? substr_replace($val['mobile'], '*****', 0, 5) : ''; $lists[] = $val; } diff --git a/admin/views/items/goods/get_info.php b/admin/views/items/goods/get_info.php index 66933121..9a453894 100644 --- a/admin/views/items/goods/get_info.php +++ b/admin/views/items/goods/get_info.php @@ -20,22 +20,22 @@ - - 精品加装: - 车身色: 内饰色: + + 精品加装: + 车辆状态: - 送货地址: + 存放地址: @@ -58,15 +58,9 @@ - -
- 生产日期: - 分配日期: - 出库日期: -