diff --git a/admin/controllers/Common.php b/admin/controllers/Common.php index 183d3524..054d13f3 100644 --- a/admin/controllers/Common.php +++ b/admin/controllers/Common.php @@ -1488,12 +1488,12 @@ class Common extends CI_Controller $res = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $pid), 'id desc', 0, 0, 'id,name'); } else if ($type == 3) { $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择车型'); - $res = $this->mdAutoAttr->select(array('status>' => -1, 'type' => 1, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name'); + $res = $this->mdAutoAttr->select(array('status' => 1, 'type' => 1, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name'); } if ($tp == 1 && $type == 3) { $lists[3] = $res;//车型 - $lists[4] = $this->mdAutoAttr->select(array('status>' => -1, 'type' => 0, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name');//车身颜色 - $lists[5] = $this->mdAutoAttr->select(array('status>' => -1, 'type' => 2, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name');//内饰颜色 + $lists[4] = $this->mdAutoAttr->select(array('status' => 1, 'type' => 0, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name');//车身颜色 + $lists[5] = $this->mdAutoAttr->select(array('status' => 1, 'type' => 2, 's_id' => $pid), 'id desc', 0, 0, 'id,title as name');//内饰颜色 } else { foreach ($res as $key => $value) { $lists[] = array('id' => $value['id'], 'name' => $value['name']); diff --git a/admin/controllers/items/Inventory.php b/admin/controllers/items/Inventory.php index 78f3861c..4138866b 100644 --- a/admin/controllers/items/Inventory.php +++ b/admin/controllers/items/Inventory.php @@ -121,7 +121,7 @@ class Inventory extends HD_Controller $autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $params['brand_id']), 'id desc', 0, 0, 'id,name'); } if ($params['s_id']) { - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); } $statusAry = $this->mdInventoryLog->statusAry(); $carImgAry = $this->mdInventoryLog->carImgAry(); diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php index 8322f40e..5c862ef5 100644 --- a/admin/controllers/items/Transfer.php +++ b/admin/controllers/items/Transfer.php @@ -44,7 +44,7 @@ class Transfer extends HD_Controller $autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $params['brand_id']), 'id desc', 0, 0, 'id,name'); } if ($params['s_id']) { - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); } $total = $re['total']; $this->data['params'] = $re['params']; diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index a1312459..3129546e 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -65,7 +65,7 @@ class Goods extends HD_Controller $where_1['s_id'] = $params['s_id']; $where_2['m.s_id'] = $params['s_id']; $where_3['m.s_id'] = $params['s_id']; - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); } if ($params['v_id']) { $where['v_id'] = $params['v_id']; @@ -413,9 +413,9 @@ class Goods extends HD_Controller $autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $re['brand_id']), 'id desc', 0, 0, 'id,name'); } if ($re['s_id']) { - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); - $autoList[4] = $this->mdAutoAttr->select(array('type' => 0, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); - $autoList[5] = $this->mdAutoAttr->select(array('type' => 2, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[4] = $this->mdAutoAttr->select(array('status' => 1,'type' => 0, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[5] = $this->mdAutoAttr->select(array('status' => 1,'type' => 2, 's_id' => $re['s_id']), 'id desc', 0, 0, 'id,title as name'); } $info['city_id'] = ''; $info['county_id'] = ''; @@ -863,7 +863,7 @@ class Goods extends HD_Controller $where_1['s_id'] = $params['s_id']; $where_2['m.s_id'] = $params['s_id']; $where_3['m.s_id'] = $params['s_id']; - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); } if ($params['v_id']) { $where['v_id'] = $params['v_id']; diff --git a/admin/controllers/items/goods/Logs.php b/admin/controllers/items/goods/Logs.php index 2abce1cd..73ed5b5a 100644 --- a/admin/controllers/items/goods/Logs.php +++ b/admin/controllers/items/goods/Logs.php @@ -49,7 +49,7 @@ class Logs extends HD_Controller } if ($params['s_id']) { $where['s_id'] = $params['s_id']; - $autoList[3] = $this->mdAutoAttr->select(array('type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); + $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name'); } if ($params['v_id']) { $where['v_id'] = $params['v_id']; diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php index 4a109ab3..5dd6893e 100644 --- a/admin/views/items/goods/lists.php +++ b/admin/views/items/goods/lists.php @@ -37,7 +37,7 @@