diff --git a/admin/controllers/items/Cost.php b/admin/controllers/items/Cost.php index 9aaba34c..f9264f9f 100644 --- a/admin/controllers/items/Cost.php +++ b/admin/controllers/items/Cost.php @@ -178,7 +178,7 @@ class Cost extends HD_Controller{ $map_order = []; if($o_ids){ $where = ["id in ($o_ids)" => null]; - $fields = "id, if_usedcar, (select biz_name from lc_biz where id = lc_receiver_orders_v2.biz_id) as biz_name"; + $fields = "id, if_usedcar, (select biz_name from lc_biz where id = lc_receiver_orders_v2.biz_id) as biz_name, (select lc_sys_city.name from lc_biz left join lc_sys_city on lc_biz.city_id = lc_sys_city.city_id where lc_biz.id = lc_receiver_orders_v2.biz_id) as city_name "; $order_rows = $this->receiver_orders_v2_model->select($where,'','','',$fields); foreach ($order_rows as $item) { $map_order[$item['id']] = $item; @@ -209,6 +209,7 @@ class Cost extends HD_Controller{ $if_usedcar_name = $order['if_usedcar'] ? ' (二手车)':''; $lists[] = [ 'id' => $val['id'], + 'city_name' => $order['city_name'], 'biz_name' => $order['biz_name'], 'title' => "{$brand_name} {$series_name} {$v_name}{$if_usedcar_name}", 'vin' => $item['vin'], @@ -563,7 +564,8 @@ class Cost extends HD_Controller{ if_usedcar, if(if_usedcar=1,'是','') as if_usedcar_name, (select type from lc_biz where id = lc_receiver_orders_v2.biz_id) as biz_type, (select biz_name from lc_biz where id = lc_receiver_orders_v2.biz_id) as biz_name, - (select uname from lc_app_licheb_users where id = lc_receiver_orders_v2.admin_id) as admin_name"; + (select uname from lc_app_licheb_users where id = lc_receiver_orders_v2.admin_id) as admin_name, + (select lc_sys_city.name from lc_biz left join lc_sys_city on lc_biz.city_id = lc_sys_city.city_id where lc_biz.id = lc_receiver_orders_v2.biz_id) as city_name"; $order_rows = $this->receiver_orders_v2_model->select($where,'','','',$fields); foreach ($order_rows as $item) { $map_order[$item['id']] = $item; @@ -618,6 +620,7 @@ class Cost extends HD_Controller{ $data[] = [ 'id' => $val['id'], + 'city_name' => $order['city_name'], 'bill_name' => $val['bill_name'], 'biz_type' => $order['biz_type'], 'biz_type_name' => $this->biz_model->type_ary($order['biz_type']), @@ -718,6 +721,7 @@ class Cost extends HD_Controller{ ]; $indexs = [ 'id' => '序号', + 'city_name' => '城市', 'bill_name' => '开票方', //'biz_type' => 'biz_type', 'biz_type_name' => '门店类型', diff --git a/admin/views/items/cost/lists.php b/admin/views/items/cost/lists.php index aa985628..6ab57f98 100644 --- a/admin/views/items/cost/lists.php +++ b/admin/views/items/cost/lists.php @@ -147,6 +147,7 @@ + @@ -167,6 +168,7 @@
城市 门店 车辆 销售收入合计