diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php index 5eebaf75..664df3b6 100644 --- a/admin/controllers/biz/Settle.php +++ b/admin/controllers/biz/Settle.php @@ -241,6 +241,9 @@ class Settle extends HD_Controller $v_ids = array_unique(array_filter(array_column($all_rows,'v_id'))); $attr_ids = array_merge($cor_ids,$v_ids); $item_ids = array_unique(array_filter(array_column($all_rows,'item_id'))); + //获取品牌map + $where_brand = array('status > -1' => null); + $map_brand = $this->auto_brand_model->map('id', 'name', $where_brand, 'id desc', 0 , 0, 'id, name'); //获取车系列表 $map_sery = array(); if($s_ids){ diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php index d33d348f..702a90c6 100644 --- a/admin/libraries/Ordersv2List.php +++ b/admin/libraries/Ordersv2List.php @@ -377,6 +377,7 @@ class Ordersv2List $sale = $this->ci->mdLichebUsers->get(['id'=>$val['sale_id']],'uname'); $fields['admin_name'] = $sale['uname']; } + $fields['address'] = $info_json['c_address']; } $lists[] = $fields; } @@ -582,6 +583,7 @@ class Ordersv2List $fields['bill_time'] = ['title' => '开票时间']; $fields['id_card'] = ['title' => '身份证']; $fields['admin_name'] = ['title' => '销售人员']; + $fields['address'] = ['title' => '联系人地址']; } return $fields; }