diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 800164f3..a68cd19b 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -57,6 +57,12 @@ class Orders extends HD_Controller{ $row['v_name'] = isset($attr[$row['v_id']]) ? $attr[$row['v_id']][0]['title']:''; $row['cor_name'] = isset($attr[$row['cor_id']]) ? $attr[$row['cor_id']][0]['title']:''; $row['incor_name'] = isset($attr[$row['incor_id']]) ? $attr[$row['incor_id']][0]['title']:''; + //获取选择车辆vin + if($row['item_id']){ + $this->load->model('items/items_model', 'mdItems'); + $row_goods = $this->mdItems->get(array('id' => $row['item_id'])); + $row['vin'] = $row_goods['vin']; + } //获取贷款信息 if(!$row['payway'] && $row['status']>0){ $loan = $this->order_loans_model->get(['o_id'=>$row['id']]); diff --git a/admin/controllers/receiver/order/Agent.php b/admin/controllers/receiver/order/Agent.php index 2b11ccc5..7f5d5887 100644 --- a/admin/controllers/receiver/order/Agent.php +++ b/admin/controllers/receiver/order/Agent.php @@ -49,6 +49,7 @@ class Agent extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/controllers/receiver/order/Bill.php b/admin/controllers/receiver/order/Bill.php index 357d70b1..ce46dbf6 100644 --- a/admin/controllers/receiver/order/Bill.php +++ b/admin/controllers/receiver/order/Bill.php @@ -49,6 +49,7 @@ class Bill extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/controllers/receiver/order/Ckcar.php b/admin/controllers/receiver/order/Ckcar.php index bd1b77df..d8a82665 100644 --- a/admin/controllers/receiver/order/Ckcar.php +++ b/admin/controllers/receiver/order/Ckcar.php @@ -49,6 +49,7 @@ class Ckcar extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/controllers/receiver/order/Delivery.php b/admin/controllers/receiver/order/Delivery.php index 46375832..984412a5 100644 --- a/admin/controllers/receiver/order/Delivery.php +++ b/admin/controllers/receiver/order/Delivery.php @@ -49,6 +49,7 @@ class Delivery extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/controllers/receiver/order/Loan.php b/admin/controllers/receiver/order/Loan.php index 25d987a0..596e1f73 100644 --- a/admin/controllers/receiver/order/Loan.php +++ b/admin/controllers/receiver/order/Loan.php @@ -46,6 +46,7 @@ class Loan extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php index b789b98e..314a52c7 100644 --- a/admin/controllers/receiver/order/Sign.php +++ b/admin/controllers/receiver/order/Sign.php @@ -56,7 +56,7 @@ class Sign extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { - $where["brand_id<>3"] = null; + $where["{$t2}.brand_id<>3"] = null;//狸车品牌不显示 $params['brand_id'] = ''; } if($params['s_id']){//车系 diff --git a/admin/views/items/goods/get_info.php b/admin/views/items/goods/get_info.php index 4cf1597a..d3df9370 100644 --- a/admin/views/items/goods/get_info.php +++ b/admin/views/items/goods/get_info.php @@ -1,5 +1,5 @@