diff --git a/admin/config/qiniu.php b/admin/config/qiniu.php index ea526bc3..9afa9c88 100755 --- a/admin/config/qiniu.php +++ b/admin/config/qiniu.php @@ -1,26 +1,26 @@ input->post('select_id'); + $brand_id = $this->input->post('brand_id'); + $s_id = $this->input->post('s_id'); + $v_id = $this->input->post('v_id'); + $cor_id = $this->input->post('cor_id'); + $incor_id = $this->input->post('incor_id'); $page = $this->input->post('page') ? intval($this->input->post('page')) : 1; $size = $this->input->post('size') ? intval($this->input->post('size')) : 10; - $where = [ - 'status' => 1 - ]; + $where = "status=1 "; + $brand_id && $where.=" and brand_id=$brand_id"; + $s_id && $where.=" and s_id=$s_id"; + $v_id && $where.=" and v_id=$v_id"; + $cor_id && $where.=" and cor_id=$cor_id"; + $incor_id && $where.=" and incor_id=$incor_id"; + if($select_id){ + $fhwhere = [ + "($where) or (id=$select_id)" => null + ]; + }else{ + $fhwhere = [ + "($where)" => null + ]; + } $count = 0; $list = array(); @@ -1348,9 +1366,9 @@ class Common extends CI_Controller $this->load->model('auto/auto_brand_model'); $this->load->model('auto/auto_attr_model'); - $count = $this->items_model->count($where); + $count = $this->items_model->count($fhwhere); if ($count) { - $rows = $this->items_model->select($where, "id desc", $page, $size, 'id,brand_id,s_id,v_id,cor_id,incor_id,vin'); + $rows = $this->items_model->select($fhwhere, "id desc", $page, $size, 'id,brand_id,s_id,v_id,cor_id,incor_id,vin'); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); diff --git a/admin/controllers/app/licheb/Member.php b/admin/controllers/app/licheb/Member.php index eee341ae..02c60e9a 100755 --- a/admin/controllers/app/licheb/Member.php +++ b/admin/controllers/app/licheb/Member.php @@ -4,7 +4,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Member extends HD_Controller{ - private $groups = [1=>'销售',2=>'店长',3=>'掌柜']; + private $groups = [1=>'销售',2=>'店长',3=>'老板']; public function __construct() { diff --git a/admin/views/receiver/orders/get.php b/admin/views/receiver/orders/get.php index db3e2368..fb0b007f 100644 --- a/admin/views/receiver/orders/get.php +++ b/admin/views/receiver/orders/get.php @@ -102,18 +102,56 @@ carslist: [], page: [], bx_imgs:[], + brand_list:[], + series_list:[], + v_list:[], + cor_list:[], + incor_list:[], + brand_id:'', + s_id:'', + v_id:'', + cor_id:'', + incor_id:'' }, mounted() { var that = this; that.info = ; + that.brand_id = , + that.s_id = , + that.v_id = , + that.cor_id = , + that.incor_id = , that.bx_imgs = ; }, computed: {}, created: function () { }, methods: { + setauto: function(type){ + var that = this + var p_data = {'tp':1,'type':type} + if(type==2){ + p_data['pid'] = that.brand_id + } else if(type==3){ + p_data['pid'] = that.s_id + } + $.get("/common/auto",p_data,function(result){ + if(type==1){ + that.brand_list = result.data + }else if(type==2){ + that.series_list = result.data + }else if(type==3){ + that.v_list = result.data[3] + that.cor_list = result.data[4] + that.incor_list = result.data[5] + } + }) + }, carModal: function () { var that = this + that.setauto(1); + that.setauto(2); + that.setauto(3); that.getCars(1); layer.open({ type: 1, @@ -143,7 +181,12 @@ dataType: 'json', data: { page: page, - select_id:vm.info.item_id + select_id:vm.info.item_id, + brand_id:vm.brand_id, + s_id:vm.s_id, + v_id:vm.v_id, + cor_id:vm.cor_id, + incor_id:vm.incor_id }, success: function (re) { var carslist = re.data.list; diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php index 4b4b9b18..e0718625 100644 --- a/admin/views/receiver/orders/oinfo.php +++ b/admin/views/receiver/orders/oinfo.php @@ -123,6 +123,72 @@